Merge branch 'master' into chronograph
Fix roundup issue. If ms is 999, roundup makes it 1000 since round did not check ms or continue roundup to sec.
Merge branch 'chronograph'