Merged revisions 79049 via svnmerge from