Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Sat, 30 Jul 2022 18:50:08 +0000 (20:50 +0200)
committerjenkins <jenkins-int@bgbm.org>
Sat, 30 Jul 2022 18:50:08 +0000 (20:50 +0200)

Trivial merge