Move to gucharmap

Also apply to master