Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:39:21 +0000 (13:39 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 13 Jan 2019 12:39:21 +0000 (13:39 +0100)

Trivial merge