Enable watchdog.
Merge pull request #1298 from openscholar/1267

Enable watchdog.