Merge branch 'release/5.12.0' master 5.12.0
authorjenkins <jenkins-int@bgbm.org>
Mon, 20 Jan 2020 12:51:20 +0000 (13:51 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 20 Jan 2020 12:51:20 +0000 (13:51 +0100)

Trivial merge