Get rid of a magic number.
Merge remote-tracking branch 'upstream/poller' into poller-stefan