[mkgmap-dev] Commit r4786: merge from low-res-opt branch