Podspec passes lint
Merge branch 'develop'