Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Mon, 14 Dec 2020 19:13:35 +0000 (20:13 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 14 Dec 2020 19:13:35 +0000 (20:13 +0100)

Trivial merge