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/group_gui.cpp

@@ -820,9 +820,9 @@ public:
 						assert(vehgroup.NumVehicles() > 0);
 						v = vehgroup.vehicles_begin[0];
 						/*
-						No VehicleClicked(v) support for now, because don't want
-						to enable any contextual actions except perhaps clicking/ctrl-clicking to clone orders.
-						*/
+						 * No VehicleClicked(v) support for now, because don't want
+						 * to enable any contextual actions except perhaps clicking/ctrl-clicking to clone orders.
+						 */
 						break;
 					}