Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Mon, 23 Nov 2020 15:40:21 +0000 (16:40 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 23 Nov 2020 15:40:21 +0000 (16:40 +0100)

Trivial merge