[mkgmap-dev] Commit: r1870: Merge the index branch to trunk.