Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Tue, 10 Mar 2020 10:35:55 +0000 (11:35 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 10 Mar 2020 10:35:55 +0000 (11:35 +0100)

Trivial merge