Merge remote-tracking branch 'watchdog/master'