Merge branch '3.1' into 5.2
authorAlexander Ebert <ebert@woltlab.com>
Tue, 31 Aug 2021 11:31:31 +0000 (13:31 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 31 Aug 2021 11:31:31 +0000 (13:31 +0200)

Trivial merge