Merged revisions 82376 via svnmerge from