[WIP] Xcode 6.1 support

Sleeping for 30 seems harsh