Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 23 Mar 2020 12:49:21 +0000 (13:49 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 23 Mar 2020 12:49:21 +0000 (13:49 +0100)

Trivial merge