Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 26 Aug 2020 13:39:33 +0000 (15:39 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 26 Aug 2020 13:39:33 +0000 (15:39 +0200)

Trivial merge