Updated to v2.0.4, fixing build issues with podspec
Merge pull request #9641 from abbeycode/master

Updated to v2.0.4, fixing build issues with podspec