Merge branch '3.1' into 5.2
authorAlexander Ebert <ebert@woltlab.com>
Sun, 10 May 2020 20:05:55 +0000 (22:05 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 10 May 2020 20:05:55 +0000 (22:05 +0200)

Trivial merge