Merged revisions 82422 via svnmerge from