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

@@ -16,7 +16,6 @@
 
 static const SaveLoad _trace_restrict_mapping_desc[] = {
   SLE_VAR(TraceRestrictMappingItem, program_id, SLE_UINT32),
-  SLE_END()
 };
 
 /**
@@ -50,7 +49,6 @@ struct TraceRestrictProgramStub {
 
 static const SaveLoad _trace_restrict_program_stub_desc[] = {
 	SLE_VAR(TraceRestrictProgramStub, length, SLE_UINT32),
-	SLE_END()
 };
 
 /**
@@ -120,14 +118,12 @@ struct TraceRestrictSlotStub {
 
 static const SaveLoad _trace_restrict_slot_stub_desc[] = {
 	SLE_VAR(TraceRestrictSlotStub, length, SLE_UINT32),
-	SLE_END()
 };
 
 static const SaveLoad _trace_restrict_slot_desc[] = {
 	SLE_VAR(TraceRestrictSlot, max_occupancy, SLE_UINT32),
 	SLE_SSTR(TraceRestrictSlot, name, SLF_ALLOW_CONTROL),
 	SLE_VAR(TraceRestrictSlot, owner, SLE_UINT8),
-	SLE_END()
 };
 
 /**
@@ -174,7 +170,6 @@ static const SaveLoad _trace_restrict_counter_desc[] = {
 	SLE_VAR(TraceRestrictCounter, value, SLE_INT32),
 	SLE_SSTR(TraceRestrictCounter, name, SLF_ALLOW_CONTROL),
 	SLE_VAR(TraceRestrictCounter, owner, SLE_UINT8),
-	SLE_END()
 };
 
 /**