-Backport of elapsed time interface changes.
Merge pull request #617 from mmcguinn/master

-Backport of elapsed time interface changes.