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

@@ -4230,7 +4230,7 @@ int GetTargetRating(const Station *st, const CargoSpec *cs, const GoodsEntry *ge
 	bool skip = false;
 	int rating = 0;
 
-	if (_extra_cheats.station_rating.value) {
+	if (_cheats.station_rating.value) {
 		rating = 255;
 		skip = true;
 	} else if (HasBit(cs->callback_mask, CBM_CARGO_STATION_RATING_CALC)) {