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

@@ -80,8 +80,8 @@ static inline TLG GetTLG(TileIndex t)
 }
 
 struct DualTrackBits {
-	TrackBitsByte primary;
-	TrackBitsByte secondary;
+	TrackBits primary;
+	TrackBits secondary;
 };
 
 /**
@@ -177,7 +177,7 @@ static TrackBits MaskWireBits(TileIndex t, TrackBits tracks)
 	/* If the tracks from either a diagonal crossing or don't overlap, both
 	 * trackdirs have to be marked to mask the corresponding track bit. Else
 	 * one marked trackdir is enough the mask the track bit. */
-	TrackBitsByte mask;
+	TrackBits mask;
 	if (tracks == TRACK_BIT_CROSS || !TracksOverlap(tracks)) {
 		/* If the tracks form either a diagonal crossing or don't overlap, both
 		 * trackdirs have to be marked to mask the corresponding track bit. */