cc98ef4012
svn merge -r 14843:14954 https://svn.blender.org/svnroot/bf-blender/trunk/blender
svn merge -r 14843:14954 https://svn.blender.org/svnroot/bf-blender/trunk/blender