Following upstream fixes to DMARC, group-member email settings, and the user class.