Switched to always emailing on failure.
Merge branch 'master' into import-export