Merged revisions 77176 via svnmerge from