useless files deleted
Merge branch 'master' into delete_branch
Merge branch 'delete_branch'
Merge branch 'master' into prepare_3.4.2