Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Mon, 1 Feb 2021 11:48:01 +0000 (12:48 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 1 Feb 2021 11:48:01 +0000 (12:48 +0100)

Trivial merge