Merged revisions 63329 via svnmerge from