changes for xcode 6 beta 5
Merge remote-tracking branch 'origin/eric' into bala