Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 18 Sep 2017 10:40:16 +0000 (12:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 18 Sep 2017 10:40:16 +0000 (12:40 +0200)

Trivial merge