Merged revisions 64515 via svnmerge from