Merge a fix for a Task bug which breaks the RWLock test