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

Trivial merge