[mkgmap-dev] Commit r3801: merge split-shape branch