Merged revisions 78907 via svnmerge from