Merged revisions 82514 via svnmerge from