[mkgmap-dev] Merge unicode branch