(iOS) Get rid of warnings
Merge remote-tracking branch 'upstream/master'