Merged revisions 78180 via svnmerge from