Revert "Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop""
Revert "Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop""

This reverts commit f41e626844c62c1cf1333a99df2e027ec205a7c6.

honnibal/spaCy,explosion/spaCy,spacy-io/spaCy,spacy-io/spaCy,explosion/spaCy,explosion/spaCy,honnibal/spaCy,spacy-io/spaCy,spacy-io/spaCy,honnibal/spaCy,explosion/spaCy,explosion/spaCy,spacy-io/spaCy,spacy-io/spaCy,explosion/spaCy,honnibal/spaCy