AsyncJobs and CronJobs now have poison_email.
Merge branch 'master' into staging