Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Sat, 23 Mar 2019 22:26:09 +0000 (23:26 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 23 Mar 2019 22:26:09 +0000 (23:26 +0100)

Trivial merge