mailgun not working so I will try sendgrid
Merge branch 'master' into HEAD