Merge branch 'bachelor' into 'master'

Merged Wurschdbude requested to merge master into bachelor

Test: First Merge

See merge request !1 (merged)

Merge request reports