Updates for XCode 6 beta5
Merge remote-tracking branch 'origin/master'