Merged revisions 79207 via svnmerge from