Xcode 6.1 fixes
More Xcode 6.1 fixes
Merge branch 'xcode61'