53e08925b5
svn merge -r 14692:14760 https://svn.blender.org/svnroot/bf-blender/trunk/blender
svn merge -r 14692:14760 https://svn.blender.org/svnroot/bf-blender/trunk/blender