Merged revisions 77795 via svnmerge from