Merged revisions 78955 via svnmerge from