Upgrade dependencies
Merge branch 'dev'