Merged revisions 77785 via svnmerge from