Add a reason why they were sent this email
Merge remote-tracking branch 'upstream/master'