Merge pull request #3941 from glensc/microtime