Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sat, 1 Jun 2019 12:27:01 +0000 (14:27 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 1 Jun 2019 12:27:01 +0000 (14:27 +0200)

Trivial merge