Merged revisions 65877 via svnmerge from