Merge branch '5.2'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 19 Feb 2020 17:45:37 +0000 (18:45 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 19 Feb 2020 17:45:37 +0000 (18:45 +0100)

Trivial merge