Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Thu, 30 Jan 2020 13:37:14 +0000 (14:37 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 30 Jan 2020 13:37:14 +0000 (14:37 +0100)

Trivial merge