Merge pull request from CocoaPods/master

merge with master