Merge branch 'master' into miami

# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp

src/skel/glfw/glfw.cpp

@@ -429,7 +429,7 @@ RwChar **_psGetVideoModeList()
 		if ( vm.flags & rwVIDEOMODEEXCLUSIVE )
 		{
 			_VMList[i] = (RwChar*)RwCalloc(100, sizeof(RwChar));
-			rwsprintf(_VMList[i],"%lu X %lu X %lu", vm.width, vm.height, vm.depth);
+			rwsprintf(_VMList[i],"%d X %d X %d", vm.width, vm.height, vm.depth);
 		}
 		else
 			_VMList[i] = nil;