Merged changes in the trunk up to revision 40911.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

source/blender/python/SConscript

@@ -42,7 +42,7 @@ if env['BF_BUILDINFO']:
     defs.append('BUILD_DATE')
 
 if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
+    defs.append('WITH_INTERNATIONAL')
 
 sources = env.Glob('intern/*.c')
 env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])