svn merge ^/trunk/blender -r43830:43864
svn merge ^/trunk/blender -r43830:43864

pyrochlore/cycles,tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird,pyrochlore/cycles,pyrochlore/cycles,tangent-opensource/coreBlackbird