Merge remote-tracking branch 'origin/master' into mmaps

Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp

dep/g3dlite/source/g3dmath.cpp

@@ -41,7 +41,7 @@ double inf() {
 }
 
 bool isNaN(float x) {
-    static const float n = nan();
+    static const float n = fnan();
     return memcmp(&x, &n, sizeof(float)) == 0;
 }