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/bridge_gui.cpp

@@ -30,6 +30,8 @@
 
 #include "table/strings.h"
 
+#include "safeguards.h"
+
 /** The type of the last built rail bridge */
 static BridgeType _last_railbridge_type = 0;
 /** The type of the last built road bridge */