Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 4 Oct 2020 15:58:45 +0000 (17:58 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 4 Oct 2020 15:58:45 +0000 (17:58 +0200)

Trivial merge