am 4195567d: Merge "Annotate the typed word with its source dictionary"

* commit '4195567d24e89b36d23fac89a01ca9459d5b7c47':
  Annotate the typed word with its source dictionary