Bug workaround/bugfix for the no-more-tasks bug
Merge branch 'no-more-tasks-workaround' into skytruth