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

@@ -26,6 +26,8 @@
 #include "table/strings.h"
 #include "table/tree_land.h"
 
+#include "safeguards.h"
+
 void PlaceTreesRandomly();
 
 /** Tree Sprites with their palettes */