Merge branch 'master' into develop
authorKatja Luther <k.luther@bgbm.org>
Tue, 24 Sep 2019 09:35:17 +0000 (11:35 +0200)
committerKatja Luther <k.luther@bgbm.org>
Tue, 24 Sep 2019 09:35:17 +0000 (11:35 +0200)

Trivial merge