Revert "Revert "Xcode 6.1 GM fixes""

This reverts commit 3271427609fed3cf5a79478671e52b2ff73e3d68.