Merge branch 'master' into staging
authorRicardo Wurmus <rekado@elephly.net>
Wed, 23 Jan 2019 11:08:54 +0000 (12:08 +0100)
committerRicardo Wurmus <rekado@elephly.net>
Wed, 23 Jan 2019 11:08:54 +0000 (12:08 +0100)

Trivial merge