Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Thu, 4 Jul 2019 15:13:52 +0000 (17:13 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 4 Jul 2019 15:13:52 +0000 (17:13 +0200)

Trivial merge