Merge branch 'fix-errors-xcode6-beta7'
Merge branch 'master' into fix-errors-xcode6-beta7