Merged changes in the trunk up to revision 55546.

Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.

release/scripts/templates_py/custom_nodes.py

@@ -37,8 +37,6 @@ class MyCustomSocket(bpy.types.NodeSocket):
     bl_idname = 'CustomSocketType'
     # Label for nice name display
     bl_label = 'Custom Node Socket'
-    # Socket color
-    bl_color = (1.0, 0.4, 0.216, 0.5)
 
     # Enum items list
     my_items = [
@@ -54,6 +52,9 @@ class MyCustomSocket(bpy.types.NodeSocket):
     def draw(self, context, layout, node):
         layout.prop(self, "myEnumProperty", text=self.name)
 
+    # Socket color
+    def draw_color(self, context, node):
+        return (1.0, 0.4, 0.216, 0.5)
 
 # Base class for all custom nodes in this tree type.
 # Defines a poll function to enable instantiation.