Merge branch '3.0' into 3.1
authorAlexander Ebert <ebert@woltlab.com>
Wed, 8 Apr 2020 15:07:29 +0000 (17:07 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 8 Apr 2020 15:07:29 +0000 (17:07 +0200)

Trivial merge