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