Podspec file change
Merge branch 'master' into ocslim

Conflicts: