Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp

src/core/re3.cpp

@@ -1,7 +1,6 @@
 #include <csignal>
 #define WITHWINDOWS
 #include "common.h"
-#include "crossplatform.h"
 #include "Renderer.h"
 #include "Occlusion.h"
 #include "Credits.h"
@@ -39,6 +38,10 @@
 #include "ControllerConfig.h"
 #endif
 
+#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
+#include "crossplatform.h"
+#endif
+
 #ifndef _WIN32
 #include "assert.h"
 #include <stdarg.h>