Fixed a bug in the Charset Type 1 SID/GID mapping.
Merged master
Merged master.