Blind fix for #885
Merge pull request #887 from pculture/gh-885

Blind fix for #885
updated docker config to use external smtp
Merge branch 'staging' into production