Merged revisions 65839 via svnmerge from