trivial doc edit
Merge branch 'master' into dev