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

ines · ines · commit 08d1cf850acc · 2017-11-05T21:41:58.000+01:00
diff --git a/spacy/morphology.pyx b/spacy/morphology.pyx
@@ -109,7 +109,8 @@ cdef class Morphology:
             analysis.lemma = self.lemmatize(analysis.tag.pos, token.lex.orth,
                                             self.tag_map.get(tag_str, {}))
             self._cache.set(tag_id, token.lex.orth, analysis)
-        token.lemma = analysis.lemma
+	if token.lemma == 0:
+	    token.lemma = analysis.lemma
         token.pos = analysis.tag.pos
         token.tag = analysis.tag.name
         token.morph = analysis.tag.morph
