Merge branch 'master' into develop
case 3213 - Improve cron job.
Merge branch 'case-3213' into develop

* case-3213:
  case 3213 - Improve cron job.
case 3488 - Minified watchdog message.
Merge remote-tracking branch 'origin/case-3488' into develop
Merge branch 'develop'