Merge remote-tracking branch 'origin/next' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 30 May 2016 16:44:22 +0000 (18:44 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 30 May 2016 16:44:22 +0000 (18:44 +0200)

Trivial merge