Merged revisions 79044 via svnmerge from