Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 14 Apr 2019 08:27:58 +0000 (10:27 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 14 Apr 2019 08:27:58 +0000 (10:27 +0200)

Trivial merge