Merged revisions 82274 via svnmerge from