nvda

d42d90cd - Merge latest master into chinese word segmentation branch