[mkgmap-dev] mixed index branch merge