Merged revisions 77778 via svnmerge from