Merge branch 'master' into jgrpp

# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp

src/game/game.hpp

@@ -31,9 +31,9 @@ public:
 
 	/**
 	 * Start up a new GameScript.
-	 * @param randomise Whether to randomise the configured GameScript.
+	 * @param deviate Whether to apply random deviation to the configured GameScript.
 	 */
-	static void StartNew(bool randomise = true);
+	static void StartNew(bool deviate = true);
 
 	/**
 	 * Uninitialize the Game system.

src/game/game_core.cpp

@@ -69,7 +69,7 @@
 	}
 }
 
-/* static */ void Game::StartNew(bool randomise)
+/* static */ void Game::StartNew(bool deviate)
 {
 	if (Game::instance != nullptr) return;
 
@@ -83,7 +83,7 @@
 	GameInfo *info = config->GetInfo();
 	if (info == nullptr) return;
 
-	if (randomise) config->AddRandomDeviation();
+	if (deviate) config->AddRandomDeviation(OWNER_DEITY);
 	config->AnchorUnchangeableSettings();
 
 	Backup<CompanyID> cur_company(_current_company, FILE_LINE);