Scala 2.11 compatibility for spray 1.3

Follow up on #834.

Adresses all review feedback from #834.