Merge upstream

Before, we had network-2.5.0.0 but network-uri-2.6.0.1. The two packages are meant to be used in the same version. Combined with ignoring version constraints in cabal files this lead to weird/buggy behavior.