Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Thu, 14 May 2020 16:51:35 +0000 (18:51 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 14 May 2020 16:51:35 +0000 (18:51 +0200)

Trivial merge