Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Fri, 5 Feb 2021 10:33:18 +0000 (11:33 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 5 Feb 2021 10:33:18 +0000 (11:33 +0100)

Trivial merge