Merge branch '3.0' into 3.1
authorAlexander Ebert <ebert@woltlab.com>
Sat, 27 Jun 2020 09:56:53 +0000 (11:56 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 27 Jun 2020 09:56:53 +0000 (11:56 +0200)

Trivial merge