Merged revisions 60798 via svnmerge from