Merge pull request #380 from jhaynie/master

ios: clang fixes for xcode 7.1.