less rm more force
Merge branch 'master' into centos7