Merged revisions 83879 via svnmerge from