Upgrade dependencies
Merge branch 'master' into masterX