Add emdash and endash.
Merge branch 'master' into 2013