Fixes tasks being run from schedule
Merge branch 'master' into hotfix
Updated Version 3.3.013