Merged revisions 61697 via svnmerge from