Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Fri, 21 Aug 2020 15:44:43 +0000 (17:44 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 21 Aug 2020 15:44:43 +0000 (17:44 +0200)

Trivial merge