Merge branch 'refs/heads/30-qr' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Thu, 12 Apr 2018 14:56:55 +0000 (16:56 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 12 Apr 2018 14:56:55 +0000 (16:56 +0200)

Trivial merge