update deps
Merge pull request #2890 from jbender/master

Update core and dev dependencies