Make some of the contributor guidelines clearer.
[ci skip]
Merge branch 'master' into geezer
[ci skip]