kick travis
Merge pull request #155 from evoskuil/version2

Fix zero timeout for watch-polling (high cpu usage).