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/pathfinder/yapf/yapf_road.cpp

@@ -409,9 +409,7 @@ public:
 			while (pNode->m_parent != nullptr) {
 				steps--;
 				if (pNode->GetIsChoice() && steps < YAPF_ROADVEH_PATH_CACHE_SEGMENTS) {
-					TrackdirByte td;
-					td = pNode->GetTrackdir();
-					path_cache.td.push_front(td);
+					path_cache.td.push_front(pNode->GetTrackdir());
 					path_cache.tile.push_front(pNode->GetTile());
 				}
 				pNode = pNode->m_parent;