Merged revisions 63254 via svnmerge from