Merge branch 'bb/update-unicode-table'