Merged revisions 65342 via svnmerge from