[mkgmap-dev] Merging branches