Fixing Flickr API tests
Update license year
Merge remote-tracking branch 'upstream3/master'