svn merge ^/trunk/blender -r43616:43639
svn merge ^/trunk/blender -r43616:43639

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