Merged revisions 82291 via svnmerge from