final fix!
Merge branch 'master' of https://github.com/YADev/wordpress