fix deletion of folder with contents
Merge branch 'master' into mondrian-4