Merge pull request #2112 from thess/libev-work