Merge branch '5.2' into 5.3 5.3.2
authorjoshuaruesweg <ruesweg@woltlab.com>
Wed, 6 Jan 2021 15:40:00 +0000 (16:40 +0100)
committerjoshuaruesweg <ruesweg@woltlab.com>
Wed, 6 Jan 2021 15:40:00 +0000 (16:40 +0100)

Trivial merge