Fixing the SMTP connection
Merge branch 'develop'