Merged revisions 82385 via svnmerge from