Merged revisions 78415 via svnmerge from