Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 8 Sep 2019 15:04:50 +0000 (17:04 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 8 Sep 2019 15:04:50 +0000 (17:04 +0200)

Trivial merge