svn merge -r 16608:16749 https://svn.blender.org/svnroot/bf-blender/trunk/blender