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

Trivial merge