Docs fixes.
Merge branch 'master' into major