Revamp SMTP mail stuff
Merge branch 'master' into live