Merged revisions 82396 via svnmerge from