Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Wed, 20 Jan 2021 12:13:58 +0000 (13:13 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 20 Jan 2021 12:13:58 +0000 (13:13 +0100)

Trivial merge