Patch mostly from Lennart Augustsson in #803, with additions to Task.c by me.
Attach a file by drag & drop or click to upload
