Update deps
Merge remote branch 'upstream/master' into newLook

* upstream/master:
  Update deps