Merge pull request #1117 from sipa/deadlockfix