Make overlapping poll events more managable
Merge pull request #322 from deltamation/polling-ds

Make overlapping poll events more managable