Fixes Xcode 6 warnings
Merge pull request #7998 from ricardoquesada/xcode_6_compatible

Fixes Xcode 6 warnings