Merged revisions 79174 via svnmerge from