Fixed failing tests.
Merge branch 'master' into dsuch-t-gh323-add-alembic-http_soap
Wait longer for the test TLS server to start up.
GH #323 - Added a migration for http_soap's rows new in 2.0
Merge branch 'dsuch-t-gh323-add-alembic-http_soap'
GH #278 - Fixed typo.
GH #278 - Use msg.from_ if no from_ is given. Don't require user credentials.
GH #278 - Correctly honour CC and BCC headers.
GH #323 - Brought blank settings back.
Merge branch 'master' into support/2.0