Merge branch '6.0' into 6.1
authorMarcel Werk <burntime@woltlab.com>
Fri, 17 May 2024 10:15:14 +0000 (12:15 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 17 May 2024 10:15:14 +0000 (12:15 +0200)

Trivial merge