Merged revisions 65076 via svnmerge from