Merge branch 'master' into develop
change: podspec
Merge branch 'develop'