Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint