Elapsed time should account for the delay
Merge pull request #3368 from j2sol/wait_for_improv

Improvements to wait_for module