Merged revisions 63612 via svnmerge from