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

Trivial merge