Update to 1.6.0.

And fix a test that depended on hash ordering.