Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 22 Aug 2020 11:11:32 +0000 (13:11 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 22 Aug 2020 11:11:32 +0000 (13:11 +0200)

Trivial merge