Missing "Note" in e-mail
Merge branch 'master' into emails
Merge branch 'master' into emails