Merge branch '3.1' into 5.2
authorAlexander Ebert <ebert@woltlab.com>
Wed, 3 Jun 2020 16:18:12 +0000 (18:18 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 3 Jun 2020 16:18:12 +0000 (18:18 +0200)

Trivial merge