cpoll: misc bugfixes
Merge branch 'master' of https://github.com/xaxaxa/workspace