Merge branch 'CocoaPods/master'
Fix to libc++
Merge branch 'CocoaPods/master'
Merge pull request #2825 from Fl0p/master

Fix to libc++