Changed to use Mandrill mail server
Merge remote-tracking branch 'origin/master' into Production