poller
Merge branch 'master' into wemo

* master:
  poller