Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Wed, 10 Jun 2020 18:17:00 +0000 (20:17 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 10 Jun 2020 18:17:00 +0000 (20:17 +0200)

Trivial merge