Merged revisions 78437 via svnmerge from