Merge branch '5.4'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 11 Dec 2021 12:41:01 +0000 (13:41 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 11 Dec 2021 12:41:01 +0000 (13:41 +0100)

Trivial merge