Merged revisions 77865 via svnmerge from