[mkgmap-dev] Merge from the multipolygon branch.