Updated podspec for new CocoaPods trunk system
Merge branch 'release-1.7'