Mail SMTP plugin
Merge branch 'beta'