Merge changes I843fd9ef,Ife0a5721 into qt-dev

* changes:
  Prevent entries with identical times
  Refactor VelocityTracker_test