Merge branch 'bb/unicode-10.0' into maint