Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 8 Apr 2020 13:50:27 +0000 (15:50 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 8 Apr 2020 13:50:27 +0000 (15:50 +0200)

Trivial merge