Upstream sync

* Consider quotes as a part of word (for toggling them on/off)
* Grammar fix (in comments)