Merge branch 'master' into next
authorJoshua Rüsweg <josh@bastelstu.be>
Thu, 23 Aug 2018 15:01:13 +0000 (17:01 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Thu, 23 Aug 2018 15:01:13 +0000 (17:01 +0200)

Trivial merge