Merge pull request #2832 from razzfazz/handle_eintr