Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Fri, 27 Mar 2020 12:33:26 +0000 (13:33 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 27 Mar 2020 12:33:26 +0000 (13:33 +0100)

Trivial merge