Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Sun, 7 Oct 2018 11:21:19 +0000 (13:21 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 7 Oct 2018 11:21:19 +0000 (13:21 +0200)

Trivial merge