Fixup on Watchdog mail
Merge branch 'master' into live