Merge remote-tracking branch 'upstream/master'
Remove check for Xcode 6 beta
Bump version
Fix SDK; enable errexit before xcbuild
Merge remote-tracking branch 'tatsh-upstream/master'