Merge branch 'master' into jgrpp

# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp

src/timetable_cmd.cpp

@@ -418,7 +418,7 @@ CommandCost CmdSetTimetableStart(TileIndex tile, DoCommandFlag flags, uint32 p1,
 		}
 
 		int total_duration = v->orders.list->GetTimetableTotalDuration();
-		int num_vehs = vehs.size();
+		int num_vehs = (uint)vehs.size();
 
 		if (num_vehs >= 2) {
 			QSortT(vehs.data(), vehs.size(), &VehicleTimetableSorter);