Merge branch 'wip/piotrdrag/unicode-typography' into 'master'