[mkgmap-dev] Commit r4223: merge from couuntry-border branch