Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Wed, 29 Jan 2020 21:46:46 +0000 (22:46 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 29 Jan 2020 21:46:46 +0000 (22:46 +0100)

Trivial merge