Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 2 Jun 2021 09:25:53 +0000 (11:25 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 2 Jun 2021 09:25:53 +0000 (11:25 +0200)

Trivial merge