Reset context for each --watch triggered run.
Merge pull request #1099 from benjie/watch-context

Reset context for each --watch triggered run.

* benjie/watch-context:
  Reset context for each --watch triggered run.