Merged revisions 62371 via svnmerge from