Merge pull request #10452 from davidflanagan/bug883250

Bug 883250: don't auto-punctuate after punctuation r=rudylu(cherry picked from commit cd68aa09fed7f8343b15a7f234e16b59ce562aea)
Merge pull request #10538 from davidflanagan/bug883250-v1-train

Merge pull request #10452 from davidflanagan/bug883250