Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 2 Jul 2018 11:40:02 +0000 (13:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 2 Jul 2018 11:40:02 +0000 (13:40 +0200)

Trivial merge