Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Tue, 27 Apr 2021 15:11:22 +0000 (17:11 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 27 Apr 2021 15:11:22 +0000 (17:11 +0200)

Trivial merge