Update from SDWebImage master