Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Fri, 18 Dec 2020 18:33:51 +0000 (19:33 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 18 Dec 2020 18:33:51 +0000 (19:33 +0100)

Trivial merge