Show errors on watch
Merge branch 'master' into gh-pages
Updated build