avoid infinite loop on watch
Merge branch 'master' into simpleapp