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

@@ -89,7 +89,9 @@ static void Load_PLANLINE()
 }
 
 /** Chunk handlers related to plans. */
-extern const ChunkHandler _plan_chunk_handlers[] = {
-	{ 'PLAN', Save_PLAN, Load_PLAN, nullptr, nullptr, CH_ARRAY},
-	{ 'PLLN', nullptr, Load_PLANLINE, nullptr, nullptr, CH_ARRAY | CH_LAST},
+static const ChunkHandler plan_chunk_handlers[] = {
+	{ 'PLAN', Save_PLAN, Load_PLAN,     nullptr, nullptr, CH_ARRAY },
+	{ 'PLLN', nullptr,   Load_PLANLINE, nullptr, nullptr, CH_ARRAY },
 };
+
+extern const ChunkHandlerTable _plan_chunk_handlers(plan_chunk_handlers);