Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Sun, 27 Dec 2020 12:55:45 +0000 (13:55 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 27 Dec 2020 12:55:45 +0000 (13:55 +0100)

Trivial merge