Do not force delete files
Merge branch 'master' into gradle-2.0