Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 15 Mar 2020 11:51:20 +0000 (12:51 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 15 Mar 2020 11:51:20 +0000 (12:51 +0100)

Trivial merge