Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 28 Aug 2019 17:53:03 +0000 (19:53 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 28 Aug 2019 17:53:03 +0000 (19:53 +0200)

Trivial merge