Merge commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36' * commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36': Revert to using epoll_wait().
Merge commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36' * commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36': Revert to using epoll_wait().