ecb39291e9
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20928:20937
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20928:20937