Merged revisions 82594 via svnmerge from