Merge pull request #1 from WordPress/master

Pull from Wordpress master