Set DEFAULT_FROM_EMAIL address
Merge branch 'develop' into staging