Update dependencies.
Merge branch 'master' into update-dependencies
Rearrange some more dependencies, and back out of the Multiverse update as an interim measure to get all teh tests to pass.