am 9f17de5b: Merge "Stop inserting a space after a manually picked word."

* commit '9f17de5b4dbf1e6947cfde21e70550579ca2a30b':
  Stop inserting a space after a manually picked word.