Merged revisions 82373 via svnmerge from