Slightly more aggressive discounting for sub-ngrams of SFs
Merge remote-tracking branch 'upstream/master'