Merge branch 'master' into jgrpp

# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h

src/saveload/saveload_internal.h

@@ -53,7 +53,7 @@ void AfterLoadTemplateVehiclesUpdateImage();
 
 extern int32 _saved_scrollpos_x;
 extern int32 _saved_scrollpos_y;
-extern ZoomLevelByte _saved_scrollpos_zoom;
+extern ZoomLevel _saved_scrollpos_zoom;
 
 extern SavegameType _savegame_type;
 extern uint32 _ttdp_version;