Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Tue, 3 Nov 2020 14:50:57 +0000 (15:50 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 3 Nov 2020 14:50:57 +0000 (15:50 +0100)

Trivial merge