Add Xcode 6.2 compatibility