Merged revisions 63534 via svnmerge from