Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Sun, 22 Nov 2020 17:36:43 +0000 (18:36 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 22 Nov 2020 17:36:43 +0000 (18:36 +0100)

Trivial merge