Merge branch 'master' into bleeding-edge

* master:
  Revert "epoll: use freezable blocking call"