Documentation updates [ci-skip]
Merge remote-tracking branch 'origin/master' into new-stuff