Merge branch 'tb/unicode-7.0-display-width'