Put back the setImmediate
Merge pull request #230 from christopherobin/master

Put back the setImmediate
Release
Merge remote-tracking branch 'upstream/master' into v0.11