Merge remote-tracking branch 'origin/next' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 6 Aug 2015 19:26:45 +0000 (21:26 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 6 Aug 2015 19:26:45 +0000 (21:26 +0200)

Trivial merge