Pull in fix for calatrava-ios