Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Wed, 8 Jul 2020 12:08:55 +0000 (14:08 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 8 Jul 2020 12:08:55 +0000 (14:08 +0200)

Trivial merge