Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 20 Apr 2018 09:36:32 +0000 (11:36 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 20 Apr 2018 09:36:32 +0000 (11:36 +0200)

Trivial merge