Let's talk about documentation.
Merge branch 'master' into wip-measure-traffic-rates