CS
Update deps
Merge branch 'master' into travis-disable-libev

* master:
  Update deps
  CS