Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 19 Oct 2017 11:37:20 +0000 (13:37 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 19 Oct 2017 11:37:20 +0000 (13:37 +0200)

Trivial merge