Fix tasks not ending on game end.
Merge remote-tracking branch 'origin/master'