Merged revisions 79301 via svnmerge from