Upgraded from Unicode 6.1 to 6.3