Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 19 Aug 2020 19:57:24 +0000 (21:57 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 19 Aug 2020 19:57:24 +0000 (21:57 +0200)

Trivial merge