Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 21 Dec 2017 11:12:36 +0000 (12:12 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 21 Dec 2017 11:12:36 +0000 (12:12 +0100)

Trivial merge