Updated dependencies

All tests are passing, so it's safe to merge