Wait longer for delete
Merge branch 'master' into phantom0.2