Fixed rare bug with task.get()
Merge branch 'master'