svn merge ^/trunk/blender -r43183:43220
svn merge ^/trunk/blender -r43183:43220

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