Merged revisions 64426 via svnmerge from