Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 26 May 2020 22:05:41 +0000 (00:05 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 26 May 2020 22:05:41 +0000 (00:05 +0200)

Trivial merge