Merged revisions 65685 via svnmerge from