Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Thu, 6 May 2021 11:59:48 +0000 (13:59 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 6 May 2021 11:59:48 +0000 (13:59 +0200)

Trivial merge