Fix for Xcode 6 beta 5 changes