Update for changes in Xcode 6 Beta 6
Merge remote-tracking branch 'origin/master'