Merged changes in the trunk up to revision 43038.

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c

release/scripts/startup/bl_operators/presets.py

@@ -76,6 +76,7 @@ class AddPresetBase():
             if hasattr(self, "add"):
                 self.add(context, filepath)
             else:
+                print("Writing Preset: %r" % filepath)
                 file_preset = open(filepath, 'w')
                 file_preset.write("import bpy\n")