Change the way times are got in Measures
Merge branch 'feature-measure' into develop