am 372ca14d: Merge "Further fixes to treat 0-frequency words"

* commit '372ca14deafbc12ccd34004a8779a9d24ff1dcf8':
  Further fixes to treat 0-frequency words