Improved merging.
Merge branch 'master' of https://github.com/xivk/OsmSharp