Pull in latest changes from setdirection/ios-shared

@woolie