Merge branch 'master' into jgrpp

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp

src/map_type.h

@@ -33,8 +33,9 @@ assert_compile(sizeof(Tile) == 8);
  * Look at docs/landscape.html for the exact meaning of the members.
  */
 struct TileExtended {
-	byte m6; ///< General purpose
-	byte m7; ///< Primarily used for newgrf support
+	byte m6;   ///< General purpose
+	byte m7;   ///< Primarily used for newgrf support
+	uint16 m8; ///< General purpose
 };
 
 /**