Merge branch '5.4'
authorMarcel Werk <burntime@woltlab.com>
Sat, 7 May 2022 15:42:08 +0000 (17:42 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 7 May 2022 15:42:08 +0000 (17:42 +0200)

Trivial merge