Merge branch 'release/5.22.0' 5.22.0
authorjenkins <jenkins-int@bgbm.org>
Thu, 15 Apr 2021 14:55:37 +0000 (16:55 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 15 Apr 2021 14:55:37 +0000 (16:55 +0200)

Trivial merge