Merge twisted's OSX compat fix (bug #3090)