Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 5 Mar 2020 16:46:08 +0000 (17:46 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 5 Mar 2020 16:46:08 +0000 (17:46 +0100)

Trivial merge