Merge branch 'mm/send-email-cc-cruft' into maint