Merge branch 'master' into watcher
upping version
Merge branch 'watcher'