Merged revisions 78450 via svnmerge from