[mkgmap-dev] Commit r3813: merge from split-shape branch