Merge "Merge branch release-2020 into master"
authorPaul Bauer <paul.bauer.q@gmail.com>
Wed, 4 Mar 2020 11:01:37 +0000 (12:01 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Wed, 4 Mar 2020 11:01:37 +0000 (12:01 +0100)

Trivial merge