3a9dcf1fea
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r25245:25315
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r25245:25315