Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/script/script_instance.cpp

src/saveload/ai_sl.cpp

@@ -104,11 +104,8 @@ static void Load_AIPL()
 
 		config->StringToSettings(_ai_saveload_settings);
 
-		/* Start the AI directly if it was active in the savegame */
-		if (Company::IsValidAiID(index)) {
-			AI::StartNew(index, false);
-			AI::Load(index, _ai_saveload_version);
-		}
+		/* Load the AI saved data */
+		if (Company::IsValidAiID(index)) config->SetToLoadData(AIInstance::Load(_ai_saveload_version));
 	}
 }