iOS CRP working
Merge pull request #1017 from balabhv/vb548

iOS CRP working
Merge remote-tracking branch 'upstream/master'