Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Wed, 12 May 2021 07:37:34 +0000 (09:37 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 12 May 2021 07:37:34 +0000 (09:37 +0200)

Trivial merge