do not disable routes on smtp errors anymore.
Merge branch 'master' into portable