revert 57260:  svn merge . -r57260:57259


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@57262 954f8c5b-7b00-dc11-b283-0030488c597c