Merge branch 'master' into jgrpp-beta

# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp

src/saveload/company_sl.cpp

@@ -556,7 +556,9 @@ static void Save_PLYX()
 	SaveSettingsPlyx();
 }
 
-extern const ChunkHandler _company_chunk_handlers[] = {
+static const ChunkHandler company_chunk_handlers[] = {
 	{ 'PLYR', Save_PLYR, Load_PLYR, Ptrs_PLYR, Check_PLYR, CH_ARRAY },
-	{ 'PLYX', Save_PLYX, Load_PLYX, nullptr,      Check_PLYX, CH_RIFF | CH_LAST},
+	{ 'PLYX', Save_PLYX, Load_PLYX, nullptr,   Check_PLYX, CH_RIFF  },
 };
+
+extern const ChunkHandlerTable _company_chunk_handlers(company_chunk_handlers);