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