Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 15 Oct 2018 12:54:59 +0000 (14:54 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 15 Oct 2018 12:54:59 +0000 (14:54 +0200)

Trivial merge