[mkgmap-dev] Commit: r2306: Merge of the dev-index branch.