Merge remote-tracking branch 'upstream/master' into master

server/WebApi.cpp

@@ -148,7 +148,7 @@ static ApiArgsType getAllArgs(const Parser &parser) {
     for (auto &pr :  parser.getUrlArgs()) {
         allArgs[pr.first] = pr.second;
     }
-    return std::move(allArgs);
+    return allArgs;
 }
 
 static inline void addHttpListener(){

server/WebHook.cpp

@@ -168,7 +168,7 @@ static ArgsType make_json(const MediaInfo &args){
     body["app"] = args._app;
     body["stream"] = args._streamid;
     body["params"] = args._param_strs;
-    return std::move(body);
+    return body;
 }
 
 static void reportServerStarted(){