Merge commit 'refs/top-bases/t/email/obfuscate' into t/email/obfuscate