Fix a lot of stupids interactions with Flickr
Merge branch 'Jules'' into develop