Merge branch '3.1' into 5.2
authorMatthias Schmidt <gravatronics@live.com>
Sat, 13 Jun 2020 12:32:30 +0000 (14:32 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 13 Jun 2020 12:32:30 +0000 (14:32 +0200)

Trivial merge