[mkgmap-dev] Commit: r2271: Merge the performance branch