Merged revisions 83175 via svnmerge from