watch: updated for new 'relay' plugin
Merge branch 'watch' into toaster