Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 4 Apr 2019 10:52:41 +0000 (12:52 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 4 Apr 2019 10:52:41 +0000 (12:52 +0200)

Trivial merge