Merged revisions 79833 via svnmerge from