Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Mon, 1 Jun 2020 11:57:21 +0000 (13:57 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 1 Jun 2020 11:57:21 +0000 (13:57 +0200)

Trivial merge