Merge branch 'master' into jgrpp-nrt

# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp

src/ai/ai_instance.cpp

@@ -230,6 +230,7 @@ void AIInstance::Died()
 
 void AIInstance::LoadDummyScript()
 {
+	ScriptAllocatorScope alloc_scope(this->engine);
 	extern void Script_CreateDummy(HSQUIRRELVM vm, StringID string, const char *type);
 	Script_CreateDummy(this->engine->GetVM(), STR_ERROR_AI_NO_AI_FOUND, "AI");
 }

src/ai/ai_scanner.cpp

@@ -31,6 +31,8 @@ void AIScannerInfo::Initialize()
 {
 	ScriptScanner::Initialize("AIScanner");
 
+	ScriptAllocatorScope alloc_scope(this->engine);
+
 	/* Create the dummy AI */
 	free(this->main_script);
 	this->main_script = stredup("%_dummy");