Version updates

This change updates the versions of all dependencies
Merge remote-tracking branch 'upstream/master'