Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Wed, 12 Aug 2020 15:47:36 +0000 (17:47 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 12 Aug 2020 15:47:36 +0000 (17:47 +0200)

Trivial merge