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

Trivial merge