Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp

src/network/network_gui.cpp

@@ -347,7 +347,7 @@ protected:
 		if (r == 0) r = a->info.use_password - b->info.use_password;
 
 		/* Finally sort on the number of clients of the server in reverse order. */
-		return (r != 0) ? r < 0: !NGameClientSorter(a, b);
+		return (r != 0) ? r < 0 : !NGameClientSorter(a, b);
 	}
 
 	/** Sort the server list */