Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 31 Jul 2020 11:40:37 +0000 (13:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 31 Jul 2020 11:40:37 +0000 (13:40 +0200)

Trivial merge