Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Thu, 25 Jun 2020 09:04:21 +0000 (11:04 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 25 Jun 2020 09:04:21 +0000 (11:04 +0200)

Trivial merge