Merged revisions 76983 via svnmerge from