Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Sun, 8 Nov 2020 18:19:49 +0000 (19:19 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 8 Nov 2020 18:19:49 +0000 (19:19 +0100)

Trivial merge