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/network/network_server.cpp

@@ -2455,15 +2455,12 @@ void NetworkServerNewCompany(const Company *c, NetworkClientInfo *ci)
 char *NetworkServerDumpClients(char *buffer, const char *last)
 {
 	for (NetworkClientInfo *ci : NetworkClientInfo::Iterate()) {
-		YearMonthDay ymd;
-		ConvertDateToYMD(ci->join_date, &ymd);
 		buffer += seprintf(buffer, last, "  #%d: name: '%s', company: %u",
 				ci->client_id,
 				ci->client_name.c_str(),
 				ci->client_playas);
 		if (ci->join_date != 0) {
-			YearMonthDay ymd;
-			ConvertDateToYMD(ci->join_date, &ymd);
+			YearMonthDay ymd = ConvertDateToYMD(ci->join_date);
 			buffer += seprintf(buffer, last, ", joined: %4i-%02i-%02i, %i, %i, frame: %08X",
 					ymd.year, ymd.month + 1, ymd.day, ci->join_date_fract, ci->join_tick_skip_counter, ci->join_frame);
 		}