Merge pull request #1 from WordPress/master

Re-sync Fork