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/core/alloc_func.cpp

@@ -11,6 +11,8 @@
 
 #include "../stdafx.h"
 
+#include "../safeguards.h"
+
 /**
  * Function to exit with an error message after malloc() or calloc() have failed
  * @param size number of bytes we tried to allocate

src/core/bitmath_func.cpp

@@ -12,6 +12,8 @@
 #include "../stdafx.h"
 #include "bitmath_func.hpp"
 
+#include "../safeguards.h"
+
 const uint8 _ffb_64[64] = {
 	0,  0,  1,  0,  2,  0,  1,  0,
 	3,  0,  1,  0,  2,  0,  1,  0,

src/core/geometry_func.cpp

@@ -13,6 +13,8 @@
 #include "geometry_func.hpp"
 #include "math_func.hpp"
 
+#include "../safeguards.h"
+
 /**
  * Compute bounding box of both dimensions.
  * @param d1 First dimension.

src/core/math_func.cpp

@@ -12,6 +12,8 @@
 #include "../stdafx.h"
 #include "math_func.hpp"
 
+#include "../safeguards.h"
+
 /**
  * Compute least common multiple (lcm) of arguments \a a and \a b, the smallest
  * integer value that is a multiple of both \a a and \a b.

src/core/pool_func.cpp

@@ -12,6 +12,8 @@
 #include "../stdafx.h"
 #include "pool_type.hpp"
 
+#include "../safeguards.h"
+
 /**
  * Destructor removes this object from the pool vector and
  * deletes the vector itself if this was the last item removed.

src/core/random_func.cpp

@@ -13,6 +13,8 @@
 #include "random_func.hpp"
 #include "bitmath_func.hpp"
 
+#include "../safeguards.h"
+
 Randomizer _random, _interactive_random;
 
 /**