Merge branch 'master' into jgrpp

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp

config.lib

@@ -2508,9 +2508,7 @@ check_direct_music() {
 	echo "
 		#include <windows.h>
 		#include <dmksctrl.h>
-		#include <dmusici.h>
 		#include <dmusicc.h>
-		#include <dmusicf.h>
 		int main(int argc, char *argv[]) { }" > direct_music.test.c
 	$cxx_host $CFLAGS direct_music.test.c -o direct_music.test 2> /dev/null
 	res=$?