Version updates

This change updates the dependency versions
Merge remote-tracking branch 'upstream/master'