Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 19 Apr 2018 11:23:29 +0000 (13:23 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 19 Apr 2018 11:23:29 +0000 (13:23 +0200)

Trivial merge