Merge "Don't armor french spaces before punctuation followed by word characters"