Simplified email system, now more robust.
Merge remote-tracking branch 'origin/master'