Merged revisions 82280 via svnmerge from