[mkgmap-dev] Commit: r3111: merge from NOD127 branch