am d96e021a: am 1276295b: (-s ours) am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE

* commit 'd96e021a9ef03b4bbcf061723e303805919ae35c':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE