Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 15 Aug 2017 15:23:08 +0000 (17:23 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 15 Aug 2017 15:23:08 +0000 (17:23 +0200)

Trivial merge