Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 3 Mar 2020 21:20:11 +0000 (22:20 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 3 Mar 2020 21:20:11 +0000 (22:20 +0100)

Trivial merge