Merge pull request #9025 from annando/timeout-loop