Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 21 Aug 2020 11:29:48 +0000 (13:29 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 21 Aug 2020 11:29:48 +0000 (13:29 +0200)

Trivial merge