Fix error when two trackpoints have the same timestamp.
Merge branch 'master' into rider35