Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Wed, 24 Jun 2020 15:21:30 +0000 (17:21 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 24 Jun 2020 15:21:30 +0000 (17:21 +0200)

Trivial merge