Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Tue, 8 Sep 2020 09:53:51 +0000 (11:53 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 8 Sep 2020 09:53:51 +0000 (11:53 +0200)

Trivial merge