修改2
Merge branch 'master' of github.com:heywin/wordpress