Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 14 Feb 2019 17:37:35 +0000 (18:37 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 14 Feb 2019 17:37:35 +0000 (18:37 +0100)

Trivial merge