recorded times should be at least 1 ms
Merge remote-tracking branch 'origin/master'