Merge pull request #2356 from ludovic-henry/fix-thread-suspend-deadlock