Merge branch 'master' into jgrpp

# Conflicts:
#	src/cargopacket.h
#	src/cargotype.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/timer/timer_game_common.h
#	src/town.h

src/gfxinit.cpp

@@ -325,7 +325,7 @@ static bool SwitchNewGRFBlitter()
 		if (c->palette & GRFP_BLT_32BPP) depth_wanted_by_grf = 32;
 	}
 	/* We need a 32bpp blitter for font anti-alias. */
-	if (HasAntialiasedFonts()) depth_wanted_by_grf = 32;
+	if (GetFontAAState()) depth_wanted_by_grf = 32;
 
 	/* Search the best blitter. */
 	static const struct {