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

Trivial merge