unicode: Fix epic merge failure...
unicode: Fix epic merge failure...

Former-commit-id: 24f9e5ee4ee0b3143fcd0becc6435b70573ec93b [formerly f5096bf55a684fd1dba9d68d1341521c9384aa00]
Former-commit-id: a63395fdf78d0a8093d67412fc7a119d4d18e49b
haste/ivar2,torhve/ivar2,torhve/ivar2,torhve/ivar2