Merge branch 'master' into miami

# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h

src/rw/RwHelper.cpp

@@ -13,6 +13,7 @@ RtCharset *debugCharset;
 
 bool gPS2alphaTest = 1;
 
+#ifndef FINAL
 static bool charsetOpen;
 void OpenCharsetSafe()
 {
@@ -20,6 +21,7 @@ void OpenCharsetSafe()
 		RtCharsetOpen();
 	charsetOpen = true;
 }
+#endif
 
 void CreateDebugFont()
 {