Merge branch 'doc-fixes' into 'master'