Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 28 Dec 2018 13:53:12 +0000 (14:53 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 28 Dec 2018 13:53:12 +0000 (14:53 +0100)

Trivial merge