Merged revisions 78166 via svnmerge from