[mkgmap-dev] Commit r4896: step 1 of partial merge from mdr2 branch