remove unnessecary subdir
Merge branch 'master' into muplugin