Merged revisions 82250 via svnmerge from