Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Tue, 13 Apr 2021 12:03:37 +0000 (14:03 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 13 Apr 2021 12:03:37 +0000 (14:03 +0200)

Trivial merge