Merge pull request #2661 from ludovic-henry/fix-safehandle-abort