Fix behavior with curly bracket. Related to #764
Fix issue with context
Merge branch 'michel_764_electric_punctuation' into next