Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Tue, 26 May 2020 10:33:13 +0000 (12:33 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 26 May 2020 10:33:13 +0000 (12:33 +0200)

Trivial merge