Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Mon, 27 Jul 2020 16:45:49 +0000 (18:45 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 27 Jul 2020 16:45:49 +0000 (18:45 +0200)

Trivial merge