Merge pull request #2694 from ludovic-henry/fix-sleep-overflow