CronJob lock now auto-expires.
Merge branch 'master' into staging