Fix bad access on originalObject
Merge branch 'master' into with_podspec