Merged revisions 62171 via svnmerge from