updated dependencies to upstream/master