Merge pull request #1 from Automattic/master

Pull