Round the timestamp to the nearest second
Merge branch 'master' into develop