Merge remote-tracking branch 'refs/remotes/origin/2.1' into 21-qr
authorAlexander Ebert <ebert@woltlab.com>
Tue, 13 Mar 2018 14:58:58 +0000 (15:58 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 13 Mar 2018 14:58:58 +0000 (15:58 +0100)

Trivial merge