Merged revisions 65589 via svnmerge from