Merge branch 'master' into jgrpp

# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/base_media_base.h
#	src/base_media_func.h
#	src/build_vehicle_gui.cpp
#	src/dock_gui.cpp
#	src/main_gui.cpp
#	src/music_gui.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_roadstop.cpp
#	src/os/windows/string_uniscribe.h
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/strings.cpp
#	src/terraform_gui.cpp
#	src/tests/test_script_admin.cpp
#	src/tests/test_window_desc.cpp
#	src/timer/timer_game_calendar.h
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/viewport.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h

src/table/roadtypes.h

@@ -88,7 +88,7 @@ static const RoadTypeInfo _original_roadtypes[] = {
 		0x01,
 
 		/* introduction date */
-		MIN_YEAR,
+		MIN_DATE,
 
 		/* roadtypes required for this to be introduced */
 		ROADTYPES_NONE,

src/table/settings/misc_settings.ini

@@ -104,13 +104,6 @@ max      = 2
 full     = _support8bppmodes
 cat      = SC_BASIC
 
-[SDTG_SSTR]
-name     = ""graphicsset""
-type     = SLE_STRQ
-var      = BaseGraphics::ini_set
-def      = nullptr
-cat      = SC_BASIC
-
 [SDTG_SSTR]
 name     = ""soundsset""
 type     = SLE_STRQ