Update to SVN revision 58812