Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Sun, 8 Mar 2020 13:01:46 +0000 (14:01 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 8 Mar 2020 13:01:46 +0000 (14:01 +0100)

Trivial merge