Mail is now in place as a method, need an SMTP server for sending...
Merge remote-tracking branch 'origin/master'