Merged revisions 82407 via svnmerge from