Update and lock dependencies
Merge branch 'master' into dist