Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Mon, 26 Apr 2021 14:20:42 +0000 (16:20 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 26 Apr 2021 14:20:42 +0000 (16:20 +0200)

Trivial merge