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/bridge_map.h

@@ -131,17 +131,12 @@ static inline void MakeBridgeRamp(TileIndex t, Owner o, BridgeType bridgetype, D
 	SetTileType(t, MP_TUNNELBRIDGE);
 	SetTileOwner(t, o);
 	_m[t].m2 = 0;
-	if (tt == TRANSPORT_RAIL) {
-		SB(_m[t].m1, 7, 1, GB(rt, 4, 1));
-		SB(_m[t].m3, 0, 4, GB(rt, 0, 4));
-		SB(_m[t].m3, 4, 4, 0);
-	} else {
-		_m[t].m3 = rt;
-	}
+	_m[t].m3 = 0;
 	_m[t].m4 = 0;
 	_m[t].m5 = 1 << 7 | tt << 2 | d;
 	SB(_me[t].m6, 2, 4, bridgetype);
 	_me[t].m7 = 0;
+	_me[t].m8 = rt;
 }
 
 /**