Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 22 Jan 2018 12:51:57 +0000 (13:51 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 22 Jan 2018 12:51:57 +0000 (13:51 +0100)

Trivial merge