Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Tue, 22 Dec 2020 12:20:34 +0000 (13:20 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 22 Dec 2020 12:20:34 +0000 (13:20 +0100)

Trivial merge