Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Sun, 9 Sep 2018 18:42:16 +0000 (20:42 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 9 Sep 2018 18:42:16 +0000 (20:42 +0200)

Trivial merge