c1
Merge remote-tracking branch 'origin/xcode6gm' into xcode6gm