Merge branch 'master' into jgrpp

# Conflicts:
#	src/base_station_base.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/object_gui.cpp
#	src/saveload/settings_sl.cpp
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/timer/timer_game_calendar.cpp

src/sl/saveload_internal.h

@@ -67,4 +67,6 @@ CompanyManagerFace ConvertFromOldCompanyManagerFace(uint32_t face);
 
 Order UnpackOldOrder(uint16_t packed);
 
+void ResetSettingsToDefaultForLoad();
+
 #endif /* SL_SAVELOAD_INTERNAL_H */