Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Wed, 4 Mar 2020 17:18:22 +0000 (18:18 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 4 Mar 2020 17:18:22 +0000 (18:18 +0100)

Trivial merge