Xcode 6.1 GM fixes
Merge pull request #143 from nduplessis/xcode-6.1

Xcode 6.1 GM fixes