Bring latest changes from official CocoaPods