Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Wed, 6 May 2020 18:47:49 +0000 (20:47 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 6 May 2020 18:47:49 +0000 (20:47 +0200)

Trivial merge