Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Wed, 9 Dec 2020 17:43:05 +0000 (18:43 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 9 Dec 2020 17:43:05 +0000 (18:43 +0100)

Trivial merge