Merge pull request #4851 from kumpera/handle_eloop_errno