Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Mon, 1 Jun 2020 12:02:21 +0000 (14:02 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 1 Jun 2020 12:02:21 +0000 (14:02 +0200)

Trivial merge