Merged revisions 7766-7796 via svnmerge from