support old static.flickr type of URL
Merge branch 'refs/heads/master' into stable