ignore stack delete failures
Merge remote-tracking branch 'upstream/master'