Merge branch 'fixDoc' into 'master'

BUG: Fix documentation

See merge request !275
14 jobs for master in 0 seconds