Merge branch 'master' into jgrpp

# Conflicts:
#	src/base_station_base.h
#	src/industry.h
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/station_cmd.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp

src/os/macosx/crashlog_osx.cpp

@@ -15,6 +15,7 @@
 #include "../../thread.h"
 #include "../../screenshot.h"
 #include "../../debug.h"
+#include "../../video/video_driver.hpp"
 #include "macos.h"
 
 #include <errno.h>
@@ -458,7 +459,9 @@ void CDECL HandleCrash(int signum, siginfo_t *si, void *context)
 
 	CrashLogOSX log(signum, si, context);
 	log.MakeCrashLog();
-	log.DisplayCrashDialog();
+	if (VideoDriver::GetInstance() == nullptr || VideoDriver::GetInstance()->HasGUI()) {
+		log.DisplayCrashDialog();
+	}
 
 	CrashLog::AfterCrashLogCleanup();
 	abort();