Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 27 Jun 2020 05:51:16 +0000 (07:51 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 27 Jun 2020 05:51:16 +0000 (07:51 +0200)

Trivial merge