Merge branch 'release/5.18.0'
authorjenkins <jenkins-int@bgbm.org>
Thu, 3 Dec 2020 20:34:06 +0000 (21:34 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 3 Dec 2020 20:34:06 +0000 (21:34 +0100)

Trivial merge