Merged revisions 77867 via svnmerge from