Merge branch 'bb/unicode-9.0' into maint