Merge pull request #1 from WordPress/master

Update to 4.0