Merge from upstream

@apartmentlist/iosmobile 

Pull in updates from SDWebImage.