Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Thu, 30 Jul 2020 11:29:10 +0000 (13:29 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 30 Jul 2020 11:29:10 +0000 (13:29 +0200)

Trivial merge