[mkgmap-dev] Merging back the performance branch