Merge pull request #1033 from sipa/wait