Merge branch 'master' into unicode-16