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

Trivial merge