Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Tue, 16 Jul 2019 09:53:03 +0000 (11:53 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 16 Jul 2019 09:53:03 +0000 (11:53 +0200)

Trivial merge