Fix the dashes for unicode
Merge commit 'd70186fe6266c91048c11ce759c38889fcf47abe'