Merge branch 'master' into spray-1.2.0
Merge branch 'master' into spray-1.2.0
Merge pull request #2 from oGLOWo/spray-1.2.0

Spray 1.2.0