Catching duplicate points before they mess with things.
Merge remote-tracking branch 'upstream/develop' into develop