Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sat, 6 Apr 2019 10:09:28 +0000 (12:09 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 6 Apr 2019 10:09:28 +0000 (12:09 +0200)

Trivial merge