Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Mon, 10 May 2021 10:19:35 +0000 (12:19 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 10 May 2021 10:19:35 +0000 (12:19 +0200)

Trivial merge