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

# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h

src/core/main.cpp

@@ -73,6 +73,9 @@ float FramesPerSecond = 30.0f;
 
 bool gbPrintShite = false;
 bool gbModelViewer;
+#ifdef TIMEBARS
+bool gbShowTimebars;
+#endif
 
 int32 frameCount;
 
@@ -95,7 +98,6 @@ void TheGame(void);
 void DebugMenuPopulate(void);
 #endif
 
-
 void
 ValidateVersion()
 {
@@ -1095,8 +1097,10 @@ Idle(void *arg)
 #endif
 	// CCredits::Render(); // They added it to function above and also forgot it here
 
+
 #ifdef TIMEBARS
-	tbDisplay();
+	if (gbShowTimebars)
+		tbDisplay();
 #endif
 
 	DoRWStuffEndOfFrame();