Updated for Xcode 6.2
Merge fixes for Xcode 6