Merged revisions 83976 via svnmerge from