Fix forgotten SMTPException import
Merge remote-tracking branch 'upstream/master' into fix-django-mail-import
Add message to SMTPException
Add test for SMTPException step
Merge pull request #434 from infoxchange/fix-django-mail-import

Fix forgotten SMTPException import
Merge branch 'master' into integration