sync to svn r60