Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 10 Jun 2018 08:55:52 +0000 (10:55 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 10 Jun 2018 08:55:52 +0000 (10:55 +0200)

Trivial merge