Merge 'unicode' into HEAD