Merge branch '5.2' into 5.3 5.3.3
authorAlexander Ebert <ebert@woltlab.com>
Fri, 29 Jan 2021 14:25:33 +0000 (15:25 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 29 Jan 2021 14:25:33 +0000 (15:25 +0100)

Trivial merge