Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Tue, 20 Nov 2018 10:50:11 +0000 (11:50 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 20 Nov 2018 10:50:11 +0000 (11:50 +0100)

Trivial merge