Merge pull request #609 from hcavarsan/hcavarsan/merge-dep-updates