Updated for Xcode v6.1 (6A1052d)