Merge branch 'master' of https://github.com/zk-phi/spray