[mkgmap-dev] Commit r4845: merge from faster-mp branch