Minor docs cleanup
Merge branch 'docs' into development