Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Tue, 30 Nov 2021 14:31:49 +0000 (15:31 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 30 Nov 2021 14:31:49 +0000 (15:31 +0100)

Trivial merge