Merged from master
Merged from better-task-spawning