Merge pull request #3286 from rest-switch/libnopoll