Martin Yde - #8058 - Updated flickr module
Merge branch 'hotfix-flickr-update'