Merge branch 'master' into jgrpp-beta

# Conflicts:
#	src/cargopacket.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraph.h
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.h
#	src/network/network_admin.h
#	src/network/network_func.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/order_base.h
#	src/rail_cmd.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/signs_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/subsidy_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_object.cpp
#	src/settings.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/CMakeLists.txt
#	src/table/settings/settings.ini
#	src/viewport_sprite_sorter_sse4.cpp

src/saveload/extended_ver_sl.cpp

@@ -463,7 +463,6 @@ static void Save_SLXI()
 
 	static const SaveLoad _xlsi_sub_chunk_desc[] = {
 		SLE_STR(SlxiSubChunkInfo, name,           SLE_STR, 0),
-		SLE_END()
 	};
 
 	// calculate lengths
@@ -550,9 +549,8 @@ static void Load_SLXI()
 	if (chunk_flags != 0) SlErrorCorruptFmt("SLXI chunk: unknown chunk header flags: 0x%X", chunk_flags);
 
 	char name_buffer[256];
-	const SaveLoadGlobVarList xlsi_sub_chunk_name_desc[] = {
+	const SaveLoad xlsi_sub_chunk_name_desc[] = {
 		SLEG_STR(name_buffer, SLE_STRB),
-		SLEG_END()
 	};
 
 	auto version_error = [](StringID str, const char *feature, int64 p1, int64 p2) {