Avoid linking trailing punctuation in MakeClicky
Merge branch '4.0/dont-link-punctuation' into 4.0-trunk