Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Wed, 10 Nov 2021 18:22:29 +0000 (19:22 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 10 Nov 2021 18:22:29 +0000 (19:22 +0100)

Trivial merge