Merged revisions 76656 via svnmerge from