modif in settings to avoid sending mails while not in prod
Merge remote-tracking branch 'origin/master'