Merge remote-tracking branch 'origin/stable-5' into HEAD stable-5
authorsfan5 <sfan5@live.de>
Sun, 5 Apr 2020 16:48:33 +0000 (18:48 +0200)
committersfan5 <sfan5@live.de>
Sun, 5 Apr 2020 16:48:33 +0000 (18:48 +0200)

Trivial merge