Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Tue, 14 Jul 2020 13:33:23 +0000 (15:33 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 14 Jul 2020 13:33:23 +0000 (15:33 +0200)

Trivial merge