Merge pull request #706 from Arantor/release-2.1

! Ba-da-dum-dum-dum another one bites the dust. In this case, it is Inte...
Merge pull request #707 from Arantor/release-2.1

! Fix Mantis issue 4912: if a scheduled task throws an error, note it an...