[mkgmap-dev] Commit: r2362: Merge the way-closing branch.