Merge branch 'tb/unicode-6.3-zero-width'