Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Tue, 15 Dec 2020 17:19:37 +0000 (18:19 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 15 Dec 2020 17:19:37 +0000 (18:19 +0100)

Trivial merge