[mkgmap-dev] r3948 in the optimize-index branch