Update to work with Xcode 6 and 10.9.5