Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 2 Sep 2018 15:01:21 +0000 (17:01 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 2 Sep 2018 15:01:21 +0000 (17:01 +0200)

Trivial merge