Fix cron
Merge branch 'hotfix/2014-10-02-fix3'
Merge tag '2014-10-02-fix3' into develop

Fix