Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Thu, 7 May 2020 18:24:09 +0000 (20:24 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 7 May 2020 18:24:09 +0000 (20:24 +0200)

Trivial merge