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

Trivial merge