Merge branch 'master' of gitlab.hrz.tu-chemnitz.de:fsr-i/the-manual

2 jobs for master in 1 minute and 39 seconds (queued for 19 seconds)