Merged revisions 78101 via svnmerge from