Merged revisions 79057 via svnmerge from