Adding time to route segments.
Merge branch 'master' into here