Merge branch 't/email/obfuscate' into refs/top-bases/girocco