Updated to svn revision 58160