Flickr support rebased and squashed.