Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Wed, 8 Apr 2020 14:06:56 +0000 (16:06 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 8 Apr 2020 14:06:56 +0000 (16:06 +0200)

Trivial merge