Merge/upstream KIF for Xcode 6 support