Merge branch 'jh/send-email-one-cc'