sync to svn r64