Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 12 Apr 2020 22:38:26 +0000 (00:38 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 12 Apr 2020 22:38:26 +0000 (00:38 +0200)

Trivial merge