[mkgmap-dev] Commit r4093: merge from dem-tdb branch