Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 28 Jun 2020 17:35:11 +0000 (19:35 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 28 Jun 2020 17:35:11 +0000 (19:35 +0200)

Trivial merge