Fixed a bug for iOS.
Merge branch 'refs/heads/master' into callback