The most special chars.
Merge branch 'master' into 1.1