Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 13 Jun 2020 12:31:07 +0000 (14:31 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 13 Jun 2020 12:31:07 +0000 (14:31 +0200)

Trivial merge