Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Sun, 6 Dec 2020 14:09:45 +0000 (15:09 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 6 Dec 2020 14:09:45 +0000 (15:09 +0100)

Trivial merge