Merge branch 'master' into jgrpp

# Conflicts:
#	media/baseset/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console.cpp
#	src/debug.cpp
#	src/fontcache/freetypefontcache.cpp
#	src/network/network.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/windows/font_win32.cpp
#	src/settings_gui.cpp
#	src/video/sdl2_v.cpp
#	src/widgets/settings_widget.h
#	src/window_gui.h

src/table/settings/misc_settings.ini

@@ -268,6 +268,18 @@ name     = ""mono_aa""
 var      = _fcsettings.mono.aa
 def      = false
 
+[SDTG_BOOL]
+ifdef    = HAS_TRUETYPE_FONT
+name     = ""global_aa""
+var      = _fcsettings.global_aa
+def      = true
+
+[SDTG_BOOL]
+ifdef    = HAS_TRUETYPE_FONT
+name     = ""prefer_sprite_font""
+var      = _fcsettings.prefer_sprite
+def      = false
+
 [SDTG_VAR]
 name     = ""sprite_cache_size_px""
 type     = SLE_UINT