Merge branch 'master' into jgrpp

# Conflicts:
#	src/core/bitmath_func.cpp
#	src/core/bitmath_func.hpp
#	src/core/geometry_type.hpp
#	src/game/game_text.hpp
#	src/graph_gui.cpp
#	src/pathfinder/npf/npf.cpp
#	src/script/api/script_text.cpp
#	src/spritecache.cpp
#	src/track_func.h

src/spriteloader/grf.cpp

@@ -295,7 +295,7 @@ uint8_t LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, s
 				if (below != 0) {
 					SetBit(keep_levels, FindLastBit(below));
 				} else {
-					SetBit(keep_levels, FindFirstBit((~below) & available_levels));
+					SetBit(keep_levels, FindFirstBit<uint8_t>((~below) & available_levels));
 				}
 			}
 			skip_levels = available_levels & (~keep_levels);