Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Thu, 12 Nov 2020 18:16:06 +0000 (19:16 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 12 Nov 2020 18:16:06 +0000 (19:16 +0100)

Trivial merge