Merge branch 'next'
authorDaniel Abrecht <public@danielabrecht.ch>
Sat, 23 Feb 2019 00:16:33 +0000 (00:16 +0000)
committerDaniel Abrecht <public@danielabrecht.ch>
Sat, 23 Feb 2019 00:16:33 +0000 (00:16 +0000)

Trivial merge