[UP] Updated for Xcode 6b3