Upgrade dependencies
Merge branch 'upgrade-dependencies'