Bug 1013004 - Fix support for sampling intervals > 1 second; r=BenWa