Merged revisions 63611 via svnmerge from