Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Wed, 14 Apr 2021 12:06:16 +0000 (14:06 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 14 Apr 2021 12:06:16 +0000 (14:06 +0200)

Trivial merge