Merge branch '3.0' into 3.1
authorAlexander Ebert <ebert@woltlab.com>
Wed, 19 Feb 2020 17:41:05 +0000 (18:41 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 19 Feb 2020 17:41:05 +0000 (18:41 +0100)

Trivial merge