Merge branch 'master' into jgrpp

# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/group_cmd.cpp
#	src/landscape.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/saveload/afterload.cpp
#	src/script/api/script_date.cpp
#	src/sl/oldloader_sl.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/strings.cpp
#	src/subsidy_gui.cpp
#	src/survey.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_game_calendar.h

src/saveload/afterload.cpp

@@ -1792,7 +1792,7 @@ bool AfterLoadGame()
 	if (IsSavegameVersionBefore(SLV_31)) {
 		_date += DAYS_TILL_ORIGINAL_BASE_YEAR.AsDelta();
 		SetScaledTickVariables();
-		ConvertDateToYMD(_date, &_cur_date_ymd);
+		_cur_date_ymd = ConvertDateToYMD(_date);
 		UpdateCachedSnowLine();
 
 		for (Station *st : Station::Iterate())   st->build_date      += DAYS_TILL_ORIGINAL_BASE_YEAR.AsDelta();
@@ -4299,6 +4299,10 @@ bool AfterLoadGame()
 		}
 	}
 
+	for (Company *c : Company::Iterate()) {
+		UpdateCompanyLiveries(c);
+	}
+
 	/*
 	 * The center of train vehicles was changed, fix up spacing.
 	 * Delay this until all train and track updates have been performed.