Merged revisions 78717 via svnmerge from