Merged revisions 82278 via svnmerge from