This conflicts with changes from this commit:

https://github.com/spray/spray/commit/538b2c59744f41e2e85853baa6fccb13fc0c7e92