svn merge ^/trunk/blender -r43676:43685
svn merge ^/trunk/blender -r43676:43685

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