Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 3 Nov 2019 17:00:00 +0000 (18:00 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 3 Nov 2019 17:00:00 +0000 (18:00 +0100)

Trivial merge