merge with gensim/develop