Merged revisions 62842 via svnmerge from