Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Tue, 23 Jun 2020 10:05:19 +0000 (12:05 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 23 Jun 2020 10:05:19 +0000 (12:05 +0200)

Trivial merge