Merge branch 'master' of git://github.com/WordPress/WordPress
Merge branch 'master' of github.com:staylor/WordPress