Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Wed, 11 Mar 2020 11:53:22 +0000 (12:53 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 11 Mar 2020 11:53:22 +0000 (12:53 +0100)

Trivial merge