Fixed #186: ranges in the Timeline sometimes overlapping when dragging the Timeline
Merge remote-tracking branch 'origin/develop' into develop