Aligned with changes in Xcode6 Beta5.