Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Sun, 4 Oct 2020 09:09:20 +0000 (11:09 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 4 Oct 2020 09:09:20 +0000 (11:09 +0200)

Trivial merge