Merge branch 'docs-fixes' into 'master'

docs fixes

See merge request !814
28 jobs for nightly
in 1 minute and was queued for 6 seconds
Scheduled