Fixed cronjobs executing during offline mode
Merge branch '2.0'