diff --git a/config.lib b/config.lib
index 4497cd28dc..0861b2a8eb 100644
--- a/config.lib
+++ b/config.lib
@@ -71,6 +71,7 @@ set_default() {
 	with_freetype="1"
 	with_fontconfig="1"
 	with_icu="1"
+	static_icu="0"
 	with_psp_config="1"
 	with_threads="1"
 	with_distcc="1"
@@ -137,6 +138,7 @@ set_default() {
 		with_freetype
 		with_fontconfig
 		with_icu
+		static_icu
 		with_psp_config
 		with_threads
 		with_distcc
@@ -334,6 +336,10 @@ detect_params() {
 			--with-libicu)                with_icu="2";;
 			--without-libicu)             with_icu="0";;
 			--with-libicu=*)              with_icu="$optarg";;
+			--static-icu)                 static_icu="1";;
+			--static-icu=*)               static_icu="$optarg";;
+			--static-libicu)              static_icu="1";;
+			--static-libicu=*)            static_icu="$optarg";;
 
 			--with-psp-config)            with_psp_config="2";;
 			--without-psp-config)         with_psp_config="0";;
@@ -1302,7 +1308,11 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' '  '`"
 
 		# Some icu-configs have the 'feature' of not adding a space where others do add the space
-		LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
+		if [ "$static_icu" != "0" ]; then
+			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
+		else
+			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
+		fi
 	fi
 
 
@@ -2845,6 +2855,8 @@ showhelp() {
 	echo "  --with-fontconfig[=pkg-config fontconfig]"
 	echo "                                 enables fontconfig support"
 	echo "  --with-icu[=icu-config]        enables icu (used for right-to-left support)"
+	echo "  --static-icu                   try to link statically (libsicu instead of"
+	echo "                                 libicu; can fail as the new name is guessed)"
 	echo "  --with-iconv[=iconv-path]      enables iconv support"
 	echo "  --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)"
 	echo "  --with-makedepend[=makedepend] enables makedepend support"
diff --git a/known-bugs.txt b/known-bugs.txt
index 3126cc4714..b13ada794b 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -62,6 +62,17 @@ reasons why we think that fixing them is infeasible. We might make some
 minor improvements that reduce the scope of these bugs, but we will not
 be able to completely fix them.
 
+No suitable AI can be found
+	If you have no AIs and an AI is started the so-called 'dummy' AI will
+	be loaded. This AI does nothing but writing a message on the AI debug
+	window and showing a red warning. There are basically two solutions
+	for this problem: you must change the settings so no AI is started,
+	this is done in the difficulty settings window. The other solution is
+	acquiring (downloading) some AI. The easiest way to do this is via
+	the "Check Online Content" button in the main (intro) menu or via
+	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
+	accessed via the main menu.
+
 Clipping problems [FS#119]
 	In some cases sprites are not drawn as one would expect. Examples of
 	this are aircraft that might be hidden below the runway or trees that
diff --git a/readme.txt b/readme.txt
index c662abee34..f5c6faed19 100644
--- a/readme.txt
+++ b/readme.txt
@@ -175,6 +175,15 @@ If you want savegames and screenshots in the directory where the OpenTTD binary
 resides, simply have your config file in that location. But if you remove this
 config file, savegames will still be in this directory (see notes in section 4.2)
 
+OpenTTD comes without AIs, so if you want to play with AIs you have to download
+them. The easiest way is via the "Check Online Content" button in the main menu.
+You can select some AIs that you think are compatible with your playing style.
+Another way is manually downloading the AIs from the forum although then you
+need to make sure that you install all the required AI libraries too; they get
+automatically selected (and downloaded) if you get the AIs via the "Check
+Online Content". If you do not have an AI but have configured OpenTTD to start
+an AI a message will be shown that the 'dummy' AI has been started.
+
 4.1) (Required) 3rd party files:
 ---- ---------------------------
 
@@ -489,6 +498,7 @@ put them in the data/ folder and you're set to go.
 X.X) Credits:
 ---- --------
 The OpenTTD team (in alphabetical order):
+  Albert Hofkamp (Alberth)       - GUI expert
   Jean-Francois Claeys (Belugas) - GUI, newindustries and more
   Bjarni Corfitzen (Bjarni)      - MacOSX port, coder and vehicles
   Matthijs Kooijman (blathijs)   - Pathfinder-guru, pool rework
diff --git a/src/ai/api/ai_changelog.hpp b/src/ai/api/ai_changelog.hpp
index 8b964c7632..3c3ae81007 100644
--- a/src/ai/api/ai_changelog.hpp
+++ b/src/ai/api/ai_changelog.hpp
@@ -14,6 +14,10 @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
  *
+ * \b 0.7.4
+ *
+ * No changes
+ *
  * \b 0.7.3
  *
  * API additions:
@@ -29,7 +33,7 @@
  * \li AIs are now killed when they execute a DoCommand or Sleep at a time
  *     they are not allowed to do so.
  * \li When the API requests a string as parameter you can give every squirrel
- *     type and it'll be converted to a string
+ *     type and it will be converted to a string
  * \li AIs can create subclasses of API classes and use API constants as part
  *     of their own constants
  *
diff --git a/src/genworld.cpp b/src/genworld.cpp
index 5fe7531577..c92effe3d9 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -277,18 +277,19 @@ void GenerateWorld(GenerateWorldMode mode, uint size_x, uint size_y, bool reset_
 	/* Set the date before loading sprites as some newgrfs check it */
 	SetDate(ConvertYMDToDate(_settings_game.game_creation.starting_year, 0, 1));
 
+	InitializeGame(_gw.size_x, _gw.size_y, false, reset_settings);
+	PrepareGenerateWorldProgress();
+
 	/* Load the right landscape stuff */
 	GfxLoadSprites();
 	LoadStringWidthTable();
 
-	InitializeGame(_gw.size_x, _gw.size_y, false, reset_settings);
-	PrepareGenerateWorldProgress();
-
 	/* Re-init the windowing system */
 	ResetWindowSystem();
 
 	/* Create toolbars */
 	SetupColoursAndInitialWindow();
+	SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, VHM_NONE, WC_MAIN_WINDOW, 0);
 
 	if (_gw.thread != NULL) {
 		_gw.thread->Join();
diff --git a/src/misc.cpp b/src/misc.cpp
index f4a7f6dff2..18064896f5 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -59,8 +59,6 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 
 	AllocateMap(size_x, size_y);
 
-	SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, VHM_NONE, WC_MAIN_WINDOW, 0);
-
 	_pause_game = 0;
 	_fast_forward = 0;
 	_tick_counter = 0;
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 3c9fecb673..b5bae6c5fd 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -310,6 +310,7 @@ struct AboutWindow : public Window {
 			"Original graphics by Simon Foster",
 			"",
 			"The OpenTTD team (in alphabetical order):",
+			"  Albert Hofkamp (Alberth) - GUI expert",
 			"  Jean-Francois Claeys (Belugas) - GUI, newindustries and more",
 			"  Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles",
 			"  Matthijs Kooijman (blathijs) - Pathfinder-guru, pool rework",