Merged revisions 63099 via svnmerge from