Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Tue, 1 Jan 2019 21:19:28 +0000 (22:19 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 1 Jan 2019 21:19:28 +0000 (22:19 +0100)

Trivial merge