Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Tue, 12 May 2020 14:39:17 +0000 (16:39 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 12 May 2020 14:39:17 +0000 (16:39 +0200)

Trivial merge