Clear up documentation a little.
Merge branch 'master' into prf-ui