define DEFAULT_FROM_EMAIL
Merge branch 'master' into live