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

@@ -28,6 +28,8 @@ static void Load_TMPL_RPLS()
 	ReindexTemplateReplacements();
 }
 
-extern const ChunkHandler _template_replacement_chunk_handlers[] = {
-	{'TRPL', Save_TMPL_RPLS, Load_TMPL_RPLS, nullptr, nullptr, CH_ARRAY | CH_LAST},
+extern const ChunkHandler template_replacement_chunk_handlers[] = {
+	{ 'TRPL', Save_TMPL_RPLS, Load_TMPL_RPLS, nullptr, nullptr, CH_ARRAY },
 };
+
+extern const ChunkHandlerTable _template_replacement_chunk_handlers(template_replacement_chunk_handlers);