[WIP] Xcode 6.1 support

As above