Merge thomasfinch/master for iOS 8 fixes