Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h

src/rev.cpp.in

@@ -13,6 +13,8 @@
 #include "core/bitmath_func.hpp"
 #include "rev.h"
 
+#include "safeguards.h"
+
 /**
  * Is this version of OpenTTD a release version?
  * @return True if it is a release version.