Update deps due to security release
Merge branch 'master' into develop