Merge branch 'master' into next
authorMarcel Werk <burntime@woltlab.com>
Fri, 18 Jan 2019 16:38:50 +0000 (17:38 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 18 Jan 2019 16:38:50 +0000 (17:38 +0100)

Trivial merge