Merge branch 'master' into jgrpp-nrt

# Conflicts:
#	src/console_cmds.cpp
#	src/script/api/script_order.cpp
#	src/station_cmd.cpp
#	src/statusbar_gui.cpp
#	src/town_gui.cpp

src/video/dedicated_v.cpp

@@ -74,7 +74,7 @@ static void DedicatedSignalHandler(int sig)
 # include <time.h>
 # include <tchar.h>
 # include "../os/windows/win32.h"
-# include "../thread.h"
+
 static HANDLE _hInputReady, _hWaitForInputHandling;
 static HANDLE _hThread; // Thread to close
 static char _win_console_thread_buffer[200];