Merge branch '5.2' into 5.3 5.3.5
authorAlexander Ebert <ebert@woltlab.com>
Wed, 3 Mar 2021 10:45:57 +0000 (11:45 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 3 Mar 2021 10:45:57 +0000 (11:45 +0100)

Trivial merge