SMTP timeout changed from 5 to 70 secs
Merge branch 'master' of https://github.com/chuacw/StopMercuryAttacks