Merge pull request #1551 from rzhxeo/flickr