update for Xcode 6 Beta 5 (all tests pass, woohoo!)