Merge branch 'master' into dev

Source commit: 717d00eee141e26ef3b808eb17d2556dc8c91606

source/core/Common.cpp

@@ -12,6 +12,7 @@
 #include <math.h>
 #include <shlobj.h>
 #include <limits>
+#include <algorithm>
 #include <shlwapi.h>
 #include <tlhelp32.h>
 #include <psapi.h>