Merged revisions 63286 via svnmerge from