[mkgmap-dev] Merge of the build branch