Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Sat, 23 May 2020 17:35:22 +0000 (19:35 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 23 May 2020 17:35:22 +0000 (19:35 +0200)

Trivial merge