b3c238e8bc
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD