am 8556efe5: (-s ours) am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread

Merge commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920'

* commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920':
  DO NOT MERGE. Select word no longer selects spaces between words.