Big-Commit™
Xcode 6.1 fixes