Updates for Xcode 6 beta 4
Merge remote-tracking branch 'origin/master'
Updates for Xcode 6 beta 4