Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Thu, 5 Mar 2020 15:27:02 +0000 (16:27 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 5 Mar 2020 15:27:02 +0000 (16:27 +0100)

Trivial merge