Merged revisions 82358 via svnmerge from