Merged revisions 82337 via svnmerge from