Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 30 Aug 2017 09:33:34 +0000 (11:33 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 30 Aug 2017 09:33:34 +0000 (11:33 +0200)

Trivial merge