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

Trivial merge