[mkgmap-dev] Commit r4143: merge from angles branch