[mkgmap-dev] Commit r4897: merge (again) from faster-mp branch