Fix building for 5s / 6 / 6+ in simulator and Xcode 6 / 6.1