Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Fri, 20 Nov 2020 19:08:26 +0000 (20:08 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 20 Nov 2020 19:08:26 +0000 (20:08 +0100)

Trivial merge