Merged revisions 63403 via svnmerge from