Merge branch 'master' into jgrpp

# Conflicts:
#	src/cheat_gui.cpp
#	src/main_gui.cpp
#	src/network/network_gui.cpp
#	src/saveload/saveload.h
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown_type.h

src/sl/cheat_sl.cpp

@@ -28,7 +28,7 @@ struct ExtraCheatNameDesc {
 static ExtraCheatNameDesc _extra_cheat_descs[] = {
 	{ "inflation_cost",   &_extra_cheats.inflation_cost },
 	{ "inflation_income", &_extra_cheats.inflation_income },
-	{ "station_rating",   &_extra_cheats.station_rating },
+	{ "station_rating",   &_cheats.station_rating },
 	{ "town_rating",      &_extra_cheats.town_rating },
 };
 

src/sl/saveload_common.h

@@ -374,6 +374,8 @@ enum SaveLoadVersion : uint16 {
 	SLV_REMOVE_LOADED_AT_XY,                ///< 318  PR#11276 Remove loaded_at_xy variable from CargoPacket.
 	SLV_CARGO_TRAVELLED,                    ///< 319  PR#11283 CargoPacket now tracks how far it travelled inside a vehicle.
 
+	SLV_STATION_RATING_CHEAT,               ///< 320  PR#11346 Add cheat to fix station ratings at 100%.
+
 	SL_MAX_VERSION,                         ///< Highest possible saveload version
 
 	SL_SPRING_2013_v2_0_102 = 220,