Completed branch merges into master.
1. Merged branch 'improve-grammar' into master.  It also contained
changes that were previously on 'improve-context-handling'.
2. Deleted 'improve-context-handling' and 'improve-grammar'.