Merge pull request #1887 from ktsaou/clock-fixes

prevents usec/msec from using wrong .tv_nsec/.tv_usec values;