fix for nonmatching words with an internal match
Merge remote-tracking branch 'upstream/master'