Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Sat, 7 Nov 2020 09:15:35 +0000 (10:15 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 7 Nov 2020 09:15:35 +0000 (10:15 +0100)

Trivial merge