Merged revisions 82261 via svnmerge from