dependency version updates
Merge branch 'master' into sm