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

@@ -1846,7 +1846,7 @@ CommandCost CmdModifyOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			 * whether we are not going to a depot as there are three
 			 * cases where the full load flag can be active and only
 			 * one case where the flag is used for depot orders. In the
-			 * other cases for the OrderTypeByte the flags are not used,
+			 * other cases for the OrderType the flags are not used,
 			 * so do not care and those orders should not be active
 			 * when this function is called.
 			 */