Cycles: svn merge -r41205:41225 ^/trunk/blender

diff --cc CMakeLists.txt
Simple merge

diff --cc release/scripts/startup/bl_ui/space_view3d.py
Simple merge

diff --cc source/blender/blenloader/intern/writefile.c
Simple merge

diff --cc source/blender/editors/include/UI_interface.h
Simple merge

diff --cc source/blender/editors/interface/interface_intern.h
Simple merge

diff --cc source/blender/editors/render/render_preview.c
Simple merge

diff --cc source/blender/python/intern/bpy_interface.c
Simple merge

diff --cc source/blender/windowmanager/intern/wm_event_system.c
Simple merge