Add missing setImmediate
Merge branch 'michel_missing_setimmediate' into v1.13.x