diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cac003976..ce62e969f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,7 +50,7 @@ variables:
   stage: deploy
   before_script:
     - apt-get update -y || true
-    - apt-get install -y --force-yes libc6 libcurl3-gnutls libfreetype6 libirrlicht1.8 $LEVELDB_PKG liblua5.1-0 libluajit-5.1-2 libopenal1 libstdc++6 libvorbisfile3 libx11-6 zlib1g
+    - apt-get install -y --force-yes libc6 libcurl3-gnutls libfreetype6 libirrlicht1.8 $LEVELDB_PKG liblua5.1-0 libluajit-5.1-2 libopenal1 libstdc++6 libvorbisfile3 libx11-6 zlib1g doxygen gettext
   script:
     - dpkg -i build/deb/*.deb
 
@@ -65,7 +65,7 @@ build:debian-8:
   image: debian:8
   before_script:
     - apt-get update -y || true
-    - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+    - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
 
 package:debian-8:
   image: debian:8
@@ -90,7 +90,7 @@ build:debian-9:
  image: debian:9
  before_script:
    - apt-get update -y || true
-   - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+   - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
 
 package:debian-9:
   image: debian:9
@@ -119,7 +119,7 @@ build:ubuntu-14.04:
  image: ubuntu:trusty
  before_script:
    - apt-get update -y || true
-   - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+   - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
 
 package:ubuntu-14.04:
   image: ubuntu:trusty
@@ -144,7 +144,7 @@ build:ubuntu-16.04:
  image: ubuntu:xenial
  before_script:
    - apt-get update -y || true
-   - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+   - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
 
 package:ubuntu-16.04:
   image: ubuntu:xenial
@@ -169,7 +169,7 @@ build:ubuntu-16.10:
  image: ubuntu:yakkety
  before_script:
    - apt-get update -y || true
-   - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+   - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
 
 package:ubuntu-16.10:
   image: ubuntu:yakkety
@@ -194,7 +194,7 @@ build:ubuntu-17.04:
  image: ubuntu:zesty
  before_script:
    - apt-get update -y || true
-   - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+   - apt-get -y --force-yes install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev doxygen gettext
 
 package:ubuntu-17.04:
   image: ubuntu:zesty
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index ab23a4b7c..90228b110 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -295,6 +295,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
 			local first_server = search_result[1]
 			core.settings:set("address",     first_server.address)
 			core.settings:set("remote_port", first_server.port)
+			gamedata.serverdescription = first_server.description
 		end
 		return true
 	end
diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt
index 2ade00448..36f62bbf5 100644
--- a/lib/lua/CMakeLists.txt
+++ b/lib/lua/CMakeLists.txt
@@ -90,7 +90,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 else()
 	if (CMAKE_VERSION VERSION_GREATER "3.0")
 		set(CMAKE_C_STANDARD 11)
-	else
+	else()
 		if(APPLE)
 			# Fix behavior of CMAKE_CXX_STANDARD when targeting macOS.
 			if (POLICY CMP0025)