Merge trunk into branch "unicode-normalization"