Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Xcode 5 upgrade
Merge pull request #407 from CodaFi/Xcode-5

Use automatic configuration of architecture with Xcode 5.