Adding a change from the spray-1.2.0 branch that should have been in here
Merge branch 'master' into spray-1.2.0