Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 3 Jun 2020 16:19:36 +0000 (18:19 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 3 Jun 2020 16:19:36 +0000 (18:19 +0200)

Trivial merge