Merge branch 'release/5.11.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 14 Nov 2019 14:46:31 +0000 (15:46 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 14 Nov 2019 14:46:31 +0000 (15:46 +0100)

Trivial merge