Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Fri, 5 Jun 2020 11:06:26 +0000 (13:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 5 Jun 2020 11:06:26 +0000 (13:06 +0200)

Trivial merge