Merge remote-tracking branch 'origin/2.1' into 2.1
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 6 May 2017 18:21:26 +0000 (20:21 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 6 May 2017 18:21:26 +0000 (20:21 +0200)

Trivial merge