Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 14 Nov 2019 14:40:52 +0000 (15:40 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 14 Nov 2019 14:40:52 +0000 (15:40 +0100)

Trivial merge