Updated for Xcode 6.1
Merge remote-tracking branch 'origin/master'