Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Mon, 2 Sep 2019 14:38:13 +0000 (16:38 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 2 Sep 2019 14:38:13 +0000 (16:38 +0200)

Trivial merge