Merge branch 'release'
more deletion fixes
Merge branch 'master' into release