Merge branch '5.2' into 5.3
authorMatthias Schmidt <gravatronics@live.com>
Fri, 29 Jan 2021 14:55:51 +0000 (15:55 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 29 Jan 2021 14:55:51 +0000 (15:55 +0100)

Trivial merge