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/cheat_sl.cpp

@@ -79,7 +79,6 @@ static void Load_CHTX()
 		SLE_STR(CheatsExtLoad, name,           SLE_STRB, 256),
 		SLE_VAR(CheatsExtLoad, cht.been_used,  SLE_BOOL),
 		SLE_VAR(CheatsExtLoad, cht.value,      SLE_BOOL),
-		SLE_END()
 	};
 
 	CheatsExtLoad current_cheat;
@@ -122,7 +121,6 @@ static void Save_CHTX()
 		SLE_STR(CheatsExtSave, name,           SLE_STR, 0),
 		SLE_VAR(CheatsExtSave, cht.been_used,  SLE_BOOL),
 		SLE_VAR(CheatsExtSave, cht.value,      SLE_BOOL),
-		SLE_END()
 	};
 
 	SlAutolength([](void *) {
@@ -153,7 +151,6 @@ static const SaveLoad _settings_ext_save_desc[] = {
 	SLE_VAR(SettingsExtSave, flags,          SLE_UINT32),
 	SLE_STR(SettingsExtSave, name,           SLE_STR, 0),
 	SLE_VAR(SettingsExtSave, setting_length, SLE_UINT32),
-	SLE_END()
 };