Update deps
Merge with master