Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Fri, 3 Aug 2018 11:07:45 +0000 (13:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 3 Aug 2018 11:07:45 +0000 (13:07 +0200)

Trivial merge