Code review comment for ~cjwatson/launchpad:fix-dmarc-for-merges-and-code

1. Git
2. lp:~cjwatson/launchpad
3. fix-dmarc-for-merges-and-code
4. Merge into master