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

Trivial merge