Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/french.txt
#	src/network/network_udp.cpp

src/console_cmds.cpp

@@ -1421,7 +1421,9 @@ DEF_CONSOLE_CMD(ConRescanNewGRF)
 		return true;
 	}
 
-	RequestNewGRFScan();
+	if (!RequestNewGRFScan()) {
+		IConsoleWarning("NewGRF scanning is already running. Please wait until completed to run again.");
+	}
 
 	return true;
 }